From 83700521808176a11200a758f5b69c1990a727d4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 1 Nov 2011 22:35:57 -0400 Subject: [PATCH] Don't use *DISABLE_DEPRECATED guards Instead define GDK_DISABLE_DEPRECATION_WARNINGS where appropriate. --- gtk/Makefile.am | 4 ---- gtk/gtkfontsel.c | 1 - gtk/gtkhandlebox.c | 1 - gtk/gtkhbbox.c | 2 +- gtk/gtkhbox.c | 2 +- gtk/gtkhpaned.c | 1 - gtk/gtkhscale.c | 1 - gtk/gtkhscrollbar.c | 2 +- gtk/gtkhseparator.c | 1 - gtk/gtkmenu.c | 1 - gtk/gtkmenuitem.c | 7 ------- gtk/gtkmenushell.c | 1 - gtk/gtktable.c | 1 - gtk/gtktearoffmenuitem.c | 2 -- gtk/gtktreemenu.c | 1 - gtk/gtktreeview.c | 4 ---- gtk/gtkuimanager.c | 1 - gtk/gtkvbbox.c | 2 +- gtk/gtkvbox.c | 2 +- gtk/gtkvpaned.c | 2 +- gtk/gtkvscale.c | 1 - gtk/gtkvscrollbar.c | 2 +- gtk/gtkvseparator.c | 2 +- 23 files changed, 8 insertions(+), 36 deletions(-) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 906c158221..303f783c31 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -48,8 +48,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/gtk \ -I$(top_srcdir) -I../gdk \ -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ $(GTK_DEBUG_FLAGS) \ @@ -1042,8 +1040,6 @@ endif Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h" Gtk_3_0_gir_CFLAGS = \ $(AM_CPPFLAGS) \ - -UGDK_DISABLE_DEPRECATED \ - -UGTK_DISABLE_DEPRECATED \ -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API Gtk_3_0_gir_LIBS = libgtk-3.la Gtk_3_0_gir_FILES = $(introspection_files) diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index eb0c93dabb..873af183c0 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -37,7 +37,6 @@ #include -#undef GTK_DISABLE_DEPRECATED #define GDK_DISABLE_DEPRECATION_WARNINGS #include "gtkfontsel.h" diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index 4e0cda26b2..2c6c1e3be3 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -29,7 +29,6 @@ #include -#undef GTK_DISABLE_DEPRECATED #define GDK_DISABLE_DEPRECATION_WARNINGS #include "gtkhandlebox.h" diff --git a/gtk/gtkhbbox.c b/gtk/gtkhbbox.c index 8bb4fba21d..2a47deb23d 100644 --- a/gtk/gtkhbbox.c +++ b/gtk/gtkhbbox.c @@ -25,7 +25,7 @@ */ #include "config.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkhbbox.h" #include "gtkorientable.h" #include "gtkintl.h" diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c index cdfada50b4..503fe2458b 100644 --- a/gtk/gtkhbox.c +++ b/gtk/gtkhbox.c @@ -28,7 +28,7 @@ #include "gtkboxprivate.h" #include "gtkorientable.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkhbox.h" diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index 3ffee8423f..ddf2be0ef8 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -26,7 +26,6 @@ #include "config.h" -#undef GTK_DISABLE_DEPRECATED #include "gtkhpaned.h" #include "gtkorientable.h" diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c index e19a5b6b04..b7f540c5f0 100644 --- a/gtk/gtkhscale.c +++ b/gtk/gtkhscale.c @@ -29,7 +29,6 @@ #include #include -#undef GTK_DISABLE_DEPRECATED #include "gtkhscale.h" #include "gtkorientable.h" diff --git a/gtk/gtkhscrollbar.c b/gtk/gtkhscrollbar.c index 0b0ad64718..62434145db 100644 --- a/gtk/gtkhscrollbar.c +++ b/gtk/gtkhscrollbar.c @@ -28,7 +28,7 @@ #include "config.h" #include "gtkscrollbar.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkhscrollbar.h" #include "gtkorientable.h" #include "gtkintl.h" diff --git a/gtk/gtkhseparator.c b/gtk/gtkhseparator.c index 53e99fc0cf..4dea4b6d25 100644 --- a/gtk/gtkhseparator.c +++ b/gtk/gtkhseparator.c @@ -26,7 +26,6 @@ #include "config.h" -#undef GTK_DISABLE_DEPRECATED #include "gtkhseparator.h" #include "gtkorientable.h" diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index bb327b5d66..dd8d9aad17 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -113,7 +113,6 @@ #include "gtkintl.h" #include "gtktypebuiltins.h" -#undef GTK_DISABLE_DEPRECATED #include "gtktearoffmenuitem.h" diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index d21b363028..95a862b9c5 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -191,13 +191,6 @@ static void gtk_menu_item_set_related_action (GtkMenuItem *menu static void gtk_menu_item_set_use_action_appearance (GtkMenuItem *menu_item, gboolean use_appearance); -/* Declare deprecated function that need a declaration */ -#ifdef GTK_DISABLE_DEPRECATED -void gtk_menu_item_set_right_justified (GtkMenuItem *menu_item, - gboolean right_justified); -gboolean gtk_menu_item_get_right_justified (GtkMenuItem *menu_item); -#endif /* GTK_DISABLE_DEPRECATED */ - static guint menu_item_signals[LAST_SIGNAL] = { 0 }; static GtkBuildableIface *parent_buildable_iface; diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 7bda535561..0e613b2010 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -53,7 +53,6 @@ #include "gtkintl.h" #include "gtktypebuiltins.h" -#undef GTK_DISABLE_DEPRECATED #include "gtktearoffmenuitem.h" #include "a11y/gtkmenushellaccessible.h" diff --git a/gtk/gtktable.c b/gtk/gtktable.c index 91014c46dd..689cb268ea 100644 --- a/gtk/gtktable.c +++ b/gtk/gtktable.c @@ -26,7 +26,6 @@ #include "config.h" -#undef GTK_DISABLE_DEPRECATED #define GDK_DISABLE_DEPRECATION_WARNINGS #include "gtktable.h" diff --git a/gtk/gtktearoffmenuitem.c b/gtk/gtktearoffmenuitem.c index dc151ceed7..340062c83a 100644 --- a/gtk/gtktearoffmenuitem.c +++ b/gtk/gtktearoffmenuitem.c @@ -26,8 +26,6 @@ #include "config.h" -#undef GTK_DISABLE_DEPRECATED - #include "gtkmenuprivate.h" #include "gtkmenuitemprivate.h" #include "gtktearoffmenuitem.h" diff --git a/gtk/gtktreemenu.c b/gtk/gtktreemenu.c index 4bcdbbab2b..d76faa37f0 100644 --- a/gtk/gtktreemenu.c +++ b/gtk/gtktreemenu.c @@ -46,7 +46,6 @@ #include "gtkmenushellprivate.h" #include "gtkprivate.h" -#undef GTK_DISABLE_DEPRECATED #include "gtktearoffmenuitem.h" /* GObjectClass */ diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 6ac647515f..1ad9e07f72 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -662,10 +662,6 @@ static void gtk_tree_view_drag_data_received (GtkWidget *widget, guint time); /* tree_model signals */ -static void gtk_tree_view_set_hadjustment (GtkTreeView *tree_view, - GtkAdjustment *adjustment); -static void gtk_tree_view_set_vadjustment (GtkTreeView *tree_view, - GtkAdjustment *adjustment); static gboolean gtk_tree_view_real_move_cursor (GtkTreeView *tree_view, GtkMovementStep step, gint count); diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index b05d53a40c..42f00d0cc2 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -47,7 +47,6 @@ #include "gtkwindow.h" #include "gtkprivate.h" -#undef GTK_DISABLE_DEPRECATED #include "gtkuimanager.h" #include "gtktearoffmenuitem.h" diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c index f234902ee1..5e92f73a6c 100644 --- a/gtk/gtkvbbox.c +++ b/gtk/gtkvbbox.c @@ -25,7 +25,7 @@ */ #include "config.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkvbbox.h" #include "gtkorientable.h" #include "gtkintl.h" diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c index e3515eb643..514dff3eb5 100644 --- a/gtk/gtkvbox.c +++ b/gtk/gtkvbox.c @@ -28,7 +28,7 @@ #include "gtkboxprivate.h" #include "gtkorientable.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkvbox.h" #include "gtkboxprivate.h" diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index 3cc1825a15..eeb0200572 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -27,7 +27,7 @@ #include "config.h" #include "gtkorientable.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkvpaned.h" diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c index 45b540c212..e348cfcf20 100644 --- a/gtk/gtkvscale.c +++ b/gtk/gtkvscale.c @@ -29,7 +29,6 @@ #include #include -#undef GTK_DISABLE_DEPRECATED #include "gtkvscale.h" #include "gtkorientable.h" diff --git a/gtk/gtkvscrollbar.c b/gtk/gtkvscrollbar.c index f8443e37d1..402398831b 100644 --- a/gtk/gtkvscrollbar.c +++ b/gtk/gtkvscrollbar.c @@ -29,7 +29,7 @@ #include "gtkorientable.h" #include "gtkscrollbar.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkvscrollbar.h" #include "gtkintl.h" diff --git a/gtk/gtkvseparator.c b/gtk/gtkvseparator.c index 9fb5f92e77..162a62c127 100644 --- a/gtk/gtkvseparator.c +++ b/gtk/gtkvseparator.c @@ -27,7 +27,7 @@ #include "config.h" #include "gtkorientable.h" -#undef GTK_DISABLE_DEPRECATED + #include "gtkvseparator.h" -- 2.30.2